Skip to content

chore: Add a rebase rule for PR-695#701

Open
RomanNikitenko wants to merge 2 commits into
che-incubator:mainfrom
RomanNikitenko:npm-preinstall-rebase-rule.ai
Open

chore: Add a rebase rule for PR-695#701
RomanNikitenko wants to merge 2 commits into
che-incubator:mainfrom
RomanNikitenko:npm-preinstall-rebase-rule.ai

Conversation

@RomanNikitenko
Copy link
Copy Markdown
Collaborator

@RomanNikitenko RomanNikitenko commented May 11, 2026 •
edited by coderabbitai Bot
Loading

What does this PR do?

Add a rebase rule for #695

What issues does this PR fix?

see #695

How to test this PR?

Does this PR contain changes that override default upstream Code-OSS behavior?

  • the PR contains changes in the code folder (you can skip it if your changes are placed in a che extension )
  • the corresponding items were added to the CHANGELOG.md file
  • rules for automatic git rebase were added to the .rebase folder

Assisted-by: Cursor:claude-opus-4.6

Summary by CodeRabbit

  • Chores

    • Improved preinstall behavior with safer conditional header handling and clearer warnings on failures.
    • Updated conflict-resolution workflow to recognize and auto-apply replacements for modified preinstall logic.

  • Documentation

    • Added a changelog entry documenting the above updates.

Review Change Stack

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 11, 2026 •
edited
Loading

Click here to review and test in web IDE: Contribute

@RomanNikitenko RomanNikitenko changed the title chore: Add a rebase rule for https://github.com/che-incubator/che-code/pull/695 chore: Add a rebase rule for PR-695 May 11, 2026
@RomanNikitenko RomanNikitenko marked this pull request as ready for review May 11, 2026 12:39
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 11, 2026 •
edited
Loading

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: a79daea9-678e-4f20-a6e3-620af8a31b66

📥 Commits

Reviewing files that changed from the base of the PR and between 5444ac9 and 3fdbd66.

📒 Files selected for processing (3)
  • .rebase/CHANGELOG.md
  • .rebase/replace/code/build/npm/preinstall.ts.json
  • rebase.sh
🚧 Files skipped from review as they are similar to previous changes (2)
  • rebase.sh
  • .rebase/replace/code/build/npm/preinstall.ts.json
📝 Walkthrough

Walkthrough

This PR updates the npm preinstall replacement so it installs gyp dependencies first, then conditionally installs headers (skipped when VSCODE_SKIP_HEADER_INSTALL is set). Header installation is wrapped in try/catch with colored warnings on failure. The rebase conflict resolver is updated to apply this multi-line replacement for code/build/npm/preinstall.ts, and a changelog entry records the change.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Suggested reviewers

  • rgrunber
  • vitaliy-guliy
  • azatsarynnyy
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the main change: adding a rebase rule for PR-695. It uses imperative mood ('Add'), is concise at 35 characters, and directly relates to the changeset.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Rebase Rules For Upstream Changes ✅ Passed PR correctly includes all required rebase rules for upstream file modification: (1) .rebase/replace rule file, (2) .rebase/CHANGELOG.md entry, (3) rebase.sh conflict routing.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

  • Generate code and open pull requests
  • Plan features and break down work
  • Investigate incidents and troubleshoot customer tickets together
  • Automate recurring tasks and respond to alerts with triggers
  • Summarize progress and report instantly

Built for teams:

  • Shared memory across your entire org—no repeating context
  • Per-thread sandboxes to safely plan and execute work
  • Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 11, 2026

Pull Request images published ✨

Editor amd64: quay.io/che-incubator-pull-requests/che-code:pr-701-amd64
Editor arm64: quay.io/che-incubator-pull-requests/che-code:pr-701-arm64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-701-dev-amd64

@RomanNikitenko
chore: Add rebase rule for che-incubator#695
3b3595f 
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Assisted-by: Cursor:claude-opus-4.6
@RomanNikitenko
chore: Update changelog
3fdbd66 
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Assisted-by: Cursor:claude-opus-4.6
@RomanNikitenko RomanNikitenko force-pushed the npm-preinstall-rebase-rule.ai branch from 5444ac9 to 3fdbd66 Compare May 12, 2026 08:31
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 12, 2026

Pull Request images published ✨

Editor amd64: quay.io/che-incubator-pull-requests/che-code:pr-701-amd64
Editor arm64: quay.io/che-incubator-pull-requests/che-code:pr-701-arm64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-701-dev-amd64

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rgrunber rgrunber Awaiting requested review from rgrunber rgrunber is a code owner

@azatsarynnyy azatsarynnyy Awaiting requested review from azatsarynnyy azatsarynnyy is a code owner

@vitaliy-guliy vitaliy-guliy Awaiting requested review from vitaliy-guliy vitaliy-guliy is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@RomanNikitenko